- up to 1.12.99.904; bunch of extension modules is now built-in

diff --git a/xorg-xserver-server-builtin-SHA1.patch b/xorg-xserver-server-builtin-SHA1.patch
index 9e2a37893fd3f48df447cbb7b8eae34cebe8a357..1baf8aaec0259f5b37afd62be1ecb08ea32fc455 100644 (file)
--- a/xorg-xserver-server-builtin-SHA1.patch
+++ b/xorg-xserver-server-builtin-SHA1.patch
@@ -52,7 +52,7 @@ diff --git a/include/dix-config.h.in b/include/dix-config.h.in
 index 058c8fd..d6e99a5 100644
 --- a/include/dix-config.h.in
 +++ b/include/dix-config.h.in
-@@ -160,21 +160,6 @@
+@@ -142,24 +142,6 @@
  /* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
  #undef HAVE_RPCSVC_DBM_H
  
@@ -62,6 +62,9 @@ index 058c8fd..d6e99a5 100644
 -/* Define to use CommonCrypto SHA1 functions */
 -#undef HAVE_SHA1_IN_COMMONCRYPTO
 -
+-/* Define to use CryptoAPI SHA1 functions */
+-#undef HAVE_SHA1_IN_CRYPTOAPI
+-
 -/* Define to use libmd SHA1 functions */
 -#undef HAVE_SHA1_IN_LIBMD
 -
@@ -88,7 +91,7 @@ index 66a4a0f..b8c1636 100644
        $(XORG_SRCS)
 --- a/os/xsha1.c       2012-03-30 04:57:28.000000000 +0200
 +++ /dev/null  2011-06-01 08:46:43.490033582 +0200
-@@ -1,195 +0,0 @@
+@@ -1,237 +0,0 @@
 -#ifdef HAVE_DIX_CONFIG_H
 -#include <dix-config.h>
 -#endif
@@ -165,6 +168,48 @@ index 66a4a0f..b8c1636 100644
 -    return 1;
 -}
 -
+-#elif defined(HAVE_SHA1_IN_CRYPTOAPI)        /* Use CryptoAPI for SHA1 */
+-
+-#define WIN32_LEAN_AND_MEAN
+-#include <X11/Xwindows.h>
+-#include <wincrypt.h>
+-
+-static HCRYPTPROV hProv;
+-
+-void *
+-x_sha1_init(void)
+-{
+-    HCRYPTHASH *ctx = malloc(sizeof(*ctx));
+-
+-    if (!ctx)
+-        return NULL;
+-    CryptAcquireContext(&hProv, NULL, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
+-    CryptCreateHash(hProv, CALG_SHA1, 0, 0, ctx);
+-    return ctx;
+-}
+-
+-int
+-x_sha1_update(void *ctx, void *data, int size)
+-{
+-    HCRYPTHASH *hHash = ctx;
+-
+-    CryptHashData(*hHash, data, size, 0);
+-    return 1;
+-}
+-
+-int
+-x_sha1_final(void *ctx, unsigned char result[20])
+-{
+-    HCRYPTHASH *hHash = ctx;
+-    DWORD len = 20;
+-
+-    CryptGetHashParam(*hHash, HP_HASHVAL, result, &len, 0);
+-    CryptDestroyHash(*hHash);
+-    CryptReleaseContext(hProv, 0);
+-    free(ctx);
+-    return 1;
+-}
+-
 -#elif defined(HAVE_SHA1_IN_LIBGCRYPT)   /* Use libgcrypt for SHA1 */
 -
 -#include <gcrypt.h>
@@ -603,13 +648,13 @@ index 0000000..ace7d97
  else
    DIX_LIB='$(top_builddir)/dix/libdix.la'
    OS_LIB='$(top_builddir)/os/libos.la'
-@@ -1358,99 +1358,6 @@
- MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
+@@ -1358,112 +1358,6 @@
+ MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'
  CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
  
 -# SHA1 hashing
 -AC_ARG_WITH([sha1],
--            [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto],
+-            [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI],
 -                            [choose SHA1 implementation])])
 -AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
 -if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
@@ -635,6 +680,19 @@ index 0000000..ace7d97
 -              [Use CommonCrypto SHA1 functions])
 -      SHA1_LIBS=""
 -fi
+-dnl stdcall functions cannot be tested with AC_CHECK_LIB
+-AC_CHECK_HEADER([wincrypt.h], [HAVE_SHA1_IN_CRYPTOAPI=yes], [], [#include <windows.h>])
+-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_CRYPTOAPI" = xyes; then
+-      with_sha1=CryptoAPI
+-fi
+-if test "x$with_sha1" = xCryptoAPI && test "x$HAVE_SHA1_IN_CRYPTOAPI" != xyes; then
+-      AC_MSG_ERROR([CryptoAPI requested but not found])
+-fi
+-if test "x$with_sha1" = xCryptoAPI; then
+-      AC_DEFINE([HAVE_SHA1_IN_CRYPTOAPI], [1],
+-              [Use CryptoAPI SHA1 functions])
+-      SHA1_LIBS=""
+-fi
 -AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes])
 -if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then
 -      with_sha1=libmd
@@ -702,3 +760,5 @@ index 0000000..ace7d97
 -
  PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
  PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
+ 
+

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index aa8e7cbaafebf85ab384b3a6329bf542e04e3554..e35a4145bdce1f90dde3c6a513135e042637db3c 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -15,20 +15,20 @@
 %define        xorg_xserver_server_ansic_abi           0.4
 %define        xorg_xserver_server_extension_abi       6.0
 %define        xorg_xserver_server_font_abi            0.6
-%define        xorg_xserver_server_videodrv_abi        12.0
-%define        xorg_xserver_server_xinput_abi          16.0
+%define        xorg_xserver_server_videodrv_abi        13.0
+%define        xorg_xserver_server_xinput_abi          18.0
 #
 %define        pixman_ver      0.26.0
 
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.12.3
+Version:       1.12.99.904
 Release:       1
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 65a53b11bc01dcc97ee9b201dc620c32
+# Source0-md5: 22478ae3d0fadbf3374e030d5650774a
 Source1:       10-quirks.conf
 Source2:       xserver.pamd
 Source10:      %{name}-Xvfb.init
@@ -144,6 +144,8 @@ Provides:   xorg-xserver-server(extension-abi) = %{xorg_xserver_server_extension_a
 Provides:      xorg-xserver-server(font-abi) = %{xorg_xserver_server_font_abi}
 Provides:      xorg-xserver-server(videodrv-abi) = %{xorg_xserver_server_videodrv_abi}
 Provides:      xorg-xserver-server(xinput-abi) = %{xorg_xserver_server_xinput_abi}
+Provides:      xorg-xserver-module(dri)
+Provides:      xorg-xserver-libdri = %{version}-%{release}
 Obsoletes:     X11-Xserver < 1:7.0.0
 Obsoletes:     X11-driver-i2c < 1:7.0.0
 Obsoletes:     X11-modules < 1:7.0.0
@@ -153,6 +155,7 @@ Obsoletes:  XFree86-modules < 1:7.0.0
 Obsoletes:     XFree86-setup < 1:7.0.0
 Obsoletes:     Xserver
 Obsoletes:     xorg-xserver-server-xorgcfg
+Obsoletes:     xorg-xserver-libdri
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # avoid self-dependencies on included modules
@@ -330,25 +333,11 @@ X.org server source code.
 %description source -l pl.UTF-8
 Pliki źródłowe dla serwera X.org.
 
-%package -n xorg-xserver-libdri
-Summary:       DRI extension library for X.org server
-Summary(pl.UTF-8):     Biblioteka rozszerzenia DRI dla serwera X.org
-Group:         X11/Servers
-Requires:      %{name} = %{version}-%{release}
-Provides:      xorg-xserver-module(dri)
-
-%description -n xorg-xserver-libdri
-DRI extension library for X.org server.
-
-%description -n xorg-xserver-libdri -l pl.UTF-8
-Biblioteka rozszerzenia DRI dla serwera X.org.
-
 %package -n xorg-xserver-libglx
 Summary:       GLX extension library for X.org server
 Summary(pl.UTF-8):     Biblioteka rozszerzenia GLX dla serwera X.org
 Group:         X11/Servers
 Requires:      %{name} = %{version}-%{release}
-Requires:      xorg-xserver-libdri = %{version}-%{release}
 # Mesa version glapi tables in glx/ dir come from
 Provides:      xorg-xserver-libglx(glapi) = 7.1.0
 Provides:      xorg-xserver-module(glx)
@@ -506,10 +495,6 @@ fi
 %dir %{_libdir}/xorg/modules/dri
 %dir %{_libdir}/xorg/modules/drivers
 %dir %{_libdir}/xorg/modules/extensions
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
-%{?with_dri2:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri2.so}
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
-%{?with_record:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so}
 %dir %{_libdir}/xorg/modules/input
 %dir %{_libdir}/xorg/modules/multimedia
 %attr(755,root,root) %{_libdir}/xorg/modules/multimedia/*.so
@@ -593,10 +578,6 @@ fi
 %defattr(-,root,root,755)
 %{_usrsrc}/%{name}-%{version}
 
-%files -n xorg-xserver-libdri
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
-
 %files -n xorg-xserver-libglx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so