Author: dnusinow
Date: 2006-09-24 23:16:28 -0400 (Sun, 24 Sep 2006)
New Revision: 3487
Added:
trunk/xserver/xorg-server/debian/patches/20_mesa_6.5.1.diff
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/control
trunk/xserver/xorg-server/debian/patches/15_symlink_mesa.diff
trunk/xserver/xorg-server/debian/patches/series
Log:
* Update mesa symlink patch to the latest from HEAD
* Add 20_mesa_6.5.1.diff to allow the server to build with mesa 6.5.1
* Bump build-dep versions on x11proto-gl to 1.4.8, and mesa to 6.5.1
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-09-25 02:57:24 UTC (rev
3486)
+++ trunk/xserver/xorg-server/debian/changelog 2006-09-25 03:16:28 UTC (rev
3487)
@@ -1,3 +1,11 @@
+xorg-server (2:1.1.1-8) UNRELEASED; urgency=low
+
+ * Update mesa symlink patch to the latest from HEAD
+ * Add 20_mesa_6.5.1.diff to allow the server to build with mesa 6.5.1
+ * Bump build-dep versions on x11proto-gl to 1.4.8, and mesa to 6.5.1
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 24 Sep 2006 23:16:07 -0400
+
xorg-server (2:1.1.1-7) unstable; urgency=low
* Fix s390 build issue. Thanks Bastian Blank for the report and Eugene Konev
Modified: trunk/xserver/xorg-server/debian/control
===================================================================
--- trunk/xserver/xorg-server/debian/control 2006-09-25 02:57:24 UTC (rev
3486)
+++ trunk/xserver/xorg-server/debian/control 2006-09-25 03:16:28 UTC (rev
3487)
@@ -7,7 +7,7 @@
# server, and common dependencies for the DIX.
# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
# everything on is for the DMX and Xnest servers.
-Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev,
x11proto-damage-dev, x11proto-evie-dev, x11proto-fixes-dev (>= 4.0),
x11proto-kb-dev (>= 1.0.1-1), x11proto-xinerama-dev, x11proto-randr-dev,
x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev,
x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev,
x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1),
x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev,
x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1), libxdmcp-dev
(>= 1:0.99.1-1), libxfont-dev, libfontenc-dev, libxkbfile-dev (>= 1:0.99.1-1),
x11proto-xf86dri-dev, libdrm-dev, mesa-swx11-source (>> 6.5.0), x11proto-gl-dev
(>= 1.4.6-1), libgl1-mesa-dev(>= 6.5.0.cvs.20060524-1), libxmuu-dev (>=
1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), libx11-dev (>= 1:0.99.2-1),
libxrender-dev (>= 1:0.9.0-1), libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev,
quilt, libdmx-dev (>= 1:1.0.1-1), libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>=
1:0.99.1-1), libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1), libxtst-dev
(>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1)
+Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev,
x11proto-damage-dev, x11proto-evie-dev, x11proto-fixes-dev (>= 4.0),
x11proto-kb-dev (>= 1.0.1-1), x11proto-xinerama-dev, x11proto-randr-dev,
x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev,
x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev,
x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1),
x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev,
x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1), libxdmcp-dev
(>= 1:0.99.1-1), libxfont-dev, libfontenc-dev, libxkbfile-dev (>= 1:0.99.1-1),
x11proto-xf86dri-dev, libdrm-dev, mesa-swx11-source (>= 6.5.1), x11proto-gl-dev
(>= 1.4.8), libgl1-mesa-dev(>= 6.5.1), libxmuu-dev (>= 1:0.99.1-1), libxext-dev
(>= 1:0.99.1-1), libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1),
libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1),
libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1), libxt-dev (>=
1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1), libxtst-dev (>= 1:0.99.1-1),
libxres-dev (>= 1:0.99.1-1)
Build-Conflicts: xlibs-static-dev
Standards-Version: 3.7.2.0
Modified: trunk/xserver/xorg-server/debian/patches/15_symlink_mesa.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/15_symlink_mesa.diff
2006-09-25 02:57:24 UTC (rev 3486)
+++ trunk/xserver/xorg-server/debian/patches/15_symlink_mesa.diff
2006-09-25 03:16:28 UTC (rev 3487)
@@ -1,16 +1,20 @@
-Index: xorg-server/GL/symlink-mesa.sh
+Index: xorg-server-1.1.1/GL/symlink-mesa.sh
===================================================================
---- xorg-server.orig/GL/symlink-mesa.sh 2006-08-06 15:47:24.000000000
+0000
-+++ xorg-server/GL/symlink-mesa.sh 2006-08-06 15:47:36.000000000 +0000
-@@ -90,6 +90,7 @@
+--- xorg-server-1.1.1.orig/GL/symlink-mesa.sh 2006-09-21 23:07:11.000000000
-0400
++++ xorg-server-1.1.1/GL/symlink-mesa.sh 2006-09-24 19:11:12.000000000
-0400
+@@ -88,8 +88,11 @@
+ action api_noop.h
+ action api_validate.c
action api_validate.h
++ action arrayobj.c
++ action arrayobj.h
action attrib.c
action attrib.h
+ action bitset.h
action blend.c
action blend.h
action bufferobj.c
-@@ -168,6 +169,8 @@
+@@ -168,6 +171,8 @@
action polygon.h
action rastpos.c
action rastpos.h
@@ -19,3 +23,12 @@
action renderbuffer.c
action renderbuffer.h
action simple_list.h
+@@ -463,7 +468,7 @@
+ action slang_core_gc.h
+ action slang_fragment_builtin_gc.h
+ action slang_shader_syn.h
+- action slang_version_syn.h
++ action slang_pp_version_syn.h
+ action slang_vertex_builtin_gc.h
+ }
+
Added: trunk/xserver/xorg-server/debian/patches/20_mesa_6.5.1.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/20_mesa_6.5.1.diff
(rev 0)
+++ trunk/xserver/xorg-server/debian/patches/20_mesa_6.5.1.diff 2006-09-25
03:16:28 UTC (rev 3487)
@@ -0,0 +1,12 @@
+Index: xorg-server-1.1.1/GL/mesa/main/Makefile.am
+===================================================================
+--- xorg-server-1.1.1.orig/GL/mesa/main/Makefile.am 2006-09-24
23:03:47.000000000 -0400
++++ xorg-server-1.1.1/GL/mesa/main/Makefile.am 2006-09-24 23:03:57.000000000
-0400
+@@ -29,6 +29,7 @@
+ api_loopback.c \
+ api_noop.c \
+ api_validate.c \
++ arrayobj.c \
+ attrib.c \
+ blend.c \
+ bufferobj.c \
Modified: trunk/xserver/xorg-server/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server/debian/patches/series 2006-09-25 02:57:24 UTC
(rev 3486)
+++ trunk/xserver/xorg-server/debian/patches/series 2006-09-25 03:16:28 UTC
(rev 3487)
@@ -17,3 +17,4 @@
17_ignoreabi.diff
18_execinfo_only_for_backtrace.patch
19_configurable_misc_utils.patch
+20_mesa_6.5.1.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
