[SM-Commit] GIT changes to master xorg-modular grimoire by Robin Cook (0778c872e0d7bef7b42957ec4cdc39451c3fdfbc)

Robin Cook scm at mail.sourcemage.org
Sat Sep 16 21:09:05 EDT 2006


GIT changes to master xorg-modular grimoire by Robin Cook <rcook at wyrms.net>:

 xorg-xserver/xorg-server/DETAILS                               |    4 
 xorg-xserver/xorg-server/HISTORY                               |    4 
 xorg-xserver/xorg-server/PRE_BUILD                             |    4 
 xorg-xserver/xorg-server/xorg-server-1.1.1-mesalib-6.5.1.patch |   53 ----------
 4 files changed, 3 insertions(+), 62 deletions(-)

New commits:
commit 0778c872e0d7bef7b42957ec4cdc39451c3fdfbc
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    Revert "xorg-server: added patch so xorg-server would build with mesalib 6.5.1"
    
    This reverts commit c5bfe70dc48ffe091a06c0f9bcd47000c29c93de.
    
    xorg-server: reverting patch for building with mesalib

commit 1b9892d07a0a55e0eece4e9cbedc4c83b0f8218b
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    Revert "xorg-server: update back to mesalib 6.5.1"
    
    This reverts commit 2140e25647e2d84db3e2ddc1a4f7f42467e7aa19.
    
    xorg-server: reverting my update to 6.5.1

diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS
index ff8b8e6..99ba5ca 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,13 +1,13 @@
             SPELL=xorg-server
           VERSION=1.1.1
          XORG_VER=X11R7.1
-         VERSION2=6.5.1
+         VERSION2=6.5
            SOURCE=${SPELL}-${VERSION}.tar.bz2
           SOURCE2=MesaLib-${VERSION2}.tar.bz2
     SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/${SOURCE}
    SOURCE2_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE2}
       SOURCE_HASH=sha512:e9bfc86bf3bc59e36f1af4f4a46e3b67422276172594e7b3855a7ce57b20a76e3e2350375b9ff0582cc88e069fa79c80c103cbcbc23888ebb53879a498242ade
-     SOURCE2_HASH=sha512:b2322384d16656b73b98690fef9f06ca554b0321da377b3b92599b551a33ff0be7b5144eef296f231f6c04934c3cb095b365fb5cf3548e2ad2e6ede85de978d8
+     SOURCE2_HASH=sha512:3112dc03cc0d814f7dd557dbf023f9ec941e1c6ade8e49203d0cb43f57e7fcb11f51567bfce005528e8f55c7d3e8e6ef69ca7b840dc16b6507b5028e21514418
  SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
 SOURCE2_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION2}
          WEB_SITE=http://xorg.freedesktop.org/
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 9b393eb..6818269 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,7 +1,3 @@
-2006-09-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: Update to mesalib 6.5.1 again
-	* PRE_BUILD: apply patch for xorg-server 1.1.1 to build with mesalib 6.5.1
-
 2006-09-16 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: new version of mesalib 6.5.1, back to 6.5
 
diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD
index cd2b969..a2c26ff 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,6 +1,4 @@
 default_pre_build                                               &&
 unpack_file 2                                                   &&
 cd ${SOURCE_DIRECTORY}/Xext                                     &&
-patch -p0 < ${SCRIPT_DIRECTORY}/fontcache.c.includes.patch      &&
-cd ${SOURCE_DIRECTORY}                                          &&
-patch -p0 < ${SCRIPT_DIRECTORY}/xorg-server-1.1.1-mesalib-6.5.1.patch
+patch -p0 < ${SCRIPT_DIRECTORY}/fontcache.c.includes.patch
diff --git a/xorg-xserver/xorg-server/xorg-server-1.1.1-mesalib-6.5.1.patch b/xorg-xserver/xorg-server/xorg-server-1.1.1-mesalib-6.5.1.patch
deleted file mode 100644
index 743b027..0000000
--- a/xorg-xserver/xorg-server/xorg-server-1.1.1-mesalib-6.5.1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
-index 867fe57..4d5b0cd 100644
---- a/GL/mesa/main/Makefile.am
-+++ b/GL/mesa/main/Makefile.am
-@@ -29,6 +27,7 @@ nodist_libmain_la_SOURCES = accum.c \
-                     api_loopback.c \
-                     api_noop.c \
-                     api_validate.c \
-+                    arrayobj.c \
-                     attrib.c \
-                     blend.c \
-                     bufferobj.c \
-@@ -67,6 +66,7 @@ nodist_libmain_la_SOURCES = accum.c \
-                     points.c \
-                     polygon.c \
-                     rastpos.c \
-+                    rbadaptors.c \
-                     renderbuffer.c \
-                     state.c \
-                     stencil.c \
-diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
-index ccaa2a9..32f839a 100755
---- a/GL/symlink-mesa.sh
-+++ b/GL/symlink-mesa.sh
-@@ -88,8 +88,11 @@ symlink_mesa_main() {
-     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 +171,8 @@ symlink_mesa_main() {
-     action polygon.h
-     action rastpos.c
-     action rastpos.h
-+    action rbadaptors.c
-+    action rbadaptors.h
-     action renderbuffer.c
-     action renderbuffer.h
-     action simple_list.h
-@@ -468,7 +468,7 @@ symlink_mesa_shader_slang_library() {
-     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
- }        



More information about the SM-Commit mailing list