packages: xorg-xserver-server/xorg-xserver-server.spec, xorg-xserver-server...

arekm arekm at pld-linux.org
Tue Jun 30 08:41:33 CEST 2009 

Author: arekm                        Date: Tue Jun 30 06:41:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.6.1.902

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.188 -> 1.189) , xorg-xserver-server-build.patch (NONE -> 1.1)  (NEW), xorg-xserver-server-dri.patch (NONE -> 1.1)  (NEW), xorg-xserver-server-Xi.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-autoval.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-bug-5825.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-edid.patch (1.3 -> NONE)  (REMOVED), xorg-xserver-server-force-SwitchCoreKeyboard-for-evdev.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-glxproxy.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-mesa-6.5.2.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-ncurses.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-preferred-thinko.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-sanity.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-vm86-nx.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-white_cube.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-xatom-float.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-serve
 r-xiproptoint.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-xkb-color-geometry-fix.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-xtest-pointerscreen.patch (1.1 -> NONE)  (REMOVED), xorg-xserver-server-zap.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.188 packages/xorg-xserver-server/xorg-xserver-server.spec:1.189
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.188	Fri Jun  5 17:23:58 2009
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Tue Jun 30 08:41:27 2009
@@ -18,12 +18,12 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.6.1.901
-Release:	0.2%{?with_multigl:.mgl}
+Version:	1.6.1.902
+Release:	0.1%{?with_multigl:.mgl}
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	e6cba1f07006143daa95ce3f11d999b2
+# Source0-md5:	43de544c9b8b0c1d927f3e45f294211d
 Source2:	xserver.pamd
 Patch0:		%{name}-xwrapper.patch
 Patch1:		%{name}-pic-libxf86config.patch
@@ -31,7 +31,8 @@
 Patch3:		%{name}-exa.patch
 Patch5:		%{name}-xinerama-cursors.patch
 Patch6:		%{name}-less-acpi-brokenness.patch
-Patch7:		%{name}-zap.patch
+Patch7:		%{name}-dri.patch
+Patch8:		%{name}-build.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.3
 # for glx headers
@@ -78,7 +79,7 @@
 BuildRequires:	xorg-proto-compositeproto-devel >= 0.4
 BuildRequires:	xorg-proto-damageproto-devel >= 1.1
 %{?with_dmx:BuildRequires:	xorg-proto-dmxproto-devel}
-%{?with_dri2:BuildRequires:	xorg-proto-dri2proto-devel >= 1.99.3}
+%{?with_dri2:BuildRequires:	xorg-proto-dri2proto-devel >= 2.1}
 BuildRequires:	xorg-proto-evieext-devel
 BuildRequires:	xorg-proto-fixesproto-devel >= 4.0
 BuildRequires:	xorg-proto-fontcacheproto-devel
@@ -265,7 +266,7 @@
 Requires:	pixman-devel >= 0.14.0
 Requires:	xorg-lib-libpciaccess-devel
 Requires:	xorg-lib-libxkbfile-devel
-Requires:	xorg-proto-dri2proto-devel
+Requires:	xorg-proto-dri2proto-devel >= 2.1
 Requires:	xorg-proto-fontsproto-devel
 Requires:	xorg-proto-renderproto-devel >= 0.9.3
 Requires:	xorg-proto-videoproto-devel
@@ -328,6 +329,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -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
@@ -536,6 +538,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.189  2009/06/30 06:41:27  arekm
+- up to 1.6.1.902
+
 Revision 1.188  2009/06/05 15:23:58  glen
 - Suggest evdev and friends; adapter
 

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-build.patch
diff -u /dev/null packages/xorg-xserver-server/xorg-xserver-server-build.patch:1.1
--- /dev/null	Tue Jun 30 08:41:33 2009
+++ packages/xorg-xserver-server/xorg-xserver-server-build.patch	Tue Jun 30 08:41:27 2009
@@ -0,0 +1,21 @@
+--- xorg-server-1.6.1.902/hw/xfree86/common/Makefile.am~	2009-06-29 23:07:32.000000000 +0200
++++ xorg-server-1.6.1.902/hw/xfree86/common/Makefile.am	2009-06-30 08:32:35.758318463 +0200
+@@ -47,7 +47,7 @@
+               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
+               xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
+               $(XVSDKINCS) xorgVersion.h \
+-              xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
++              xf86sbusBus.h xf86xvpriv.h
+ 
+ DISTCLEANFILES = xf86Build.h
+ CLEANFILES = $(BUILT_SOURCES)
+--- xorg-server-1.6.1.902/hw/xfree86/parser/Makefile.am~	2009-06-30 08:34:09.558724639 +0200
++++ xorg-server-1.6.1.902/hw/xfree86/parser/Makefile.am	2009-06-30 08:37:41.372535747 +0200
+@@ -35,6 +35,4 @@
+ 	xf86tokens.h
+ 
+ sdk_HEADERS = \
+-	$(LIBHEADERS) \
+-	xf86Parser.h \
+-	xf86Optrec.h
++	$(LIBHEADERS)

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-dri.patch
diff -u /dev/null packages/xorg-xserver-server/xorg-xserver-server-dri.patch:1.1
--- /dev/null	Tue Jun 30 08:41:33 2009
+++ packages/xorg-xserver-server/xorg-xserver-server-dri.patch	Tue Jun 30 08:41:27 2009
@@ -0,0 +1,19 @@
+--- xorg-server-1.6.1.902/glx/glxdri2.c~	2009-06-29 23:10:40.000000000 +0200
++++ xorg-server-1.6.1.902/glx/glxdri2.c	2009-06-30 08:26:31.188770402 +0200
+@@ -222,12 +222,15 @@
+     if (texBuffer == NULL)
+         return Success;
+ 
++#if __DRI_TEX_BUFFER_VERSION >= 2
+     if (texBuffer->base.version >= 2 && texBuffer->setTexBuffer2 != NULL) {
+ 	(*texBuffer->setTexBuffer2)(context->driContext,
+ 				    glxPixmap->target,
+ 				    glxPixmap->format,
+ 				    drawable->driDrawable);
+-    } else {
++    } else
++#endif
++    {
+ 	texBuffer->setTexBuffer(context->driContext,
+ 				glxPixmap->target,
+ 				drawable->driDrawable);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.188&r2=1.189&f=u

More information about the pld-cvs-commit mailing list