Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master xorg-modular grimoire by Thomas Orgis (12a773634c6de85348532212454bb3eb8dffc826)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master xorg-modular grimoire by Thomas Orgis (12a773634c6de85348532212454bb3eb8dffc826)
  • Date: Sun, 31 Dec 2006 08:52:40 -0600

GIT changes to master xorg-modular grimoire by Thomas Orgis
<sobukus AT sourcemage.org>:

xorg-xserver/xorg-server/DETAILS | 1
xorg-xserver/xorg-server/HISTORY | 4
xorg-xserver/xorg-server/PRE_BUILD | 4
xorg-xserver/xorg-server/xorg-server-1.1.99.903-fixes-1.patch | 57
++++++++++
4 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit 12a773634c6de85348532212454bb3eb8dffc826
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

completing entry to xorg-server HISTORY

commit 7f0dd9f6da2b5e20b9dddc4681cfc70126c69bf0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

adding fixes-1 patch to xorg-server that fixes that mipmap build issue

diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 31e01a4..05ffc21 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -13,6 +13,7 @@ SOURCE2_DIRECTORY=${BUILD_DIRECTORY}/Mes
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SECURITY_PATCH=3
SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest, & Xdmx)"
cat << EOF
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 94c74f0..6593409 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2006-12-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, PRE_BUILD, xorg-server-1.1.99.903-fixes-1.patch:
+ first patchlevel, fixing Makefile stuff for including mipmap.c
+
2006-12-03 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 1.1.99.903 and 6.5.2

diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 1fd55a4..a8e135f 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,2 +1,4 @@
default_pre_build &&
-unpack_file 2
+unpack_file 2 &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/xorg-server-1.1.99.903-fixes-1.patch"
diff --git a/xorg-xserver/xorg-server/xorg-server-1.1.99.903-fixes-1.patch
b/xorg-xserver/xorg-server/xorg-server-1.1.99.903-fixes-1.patch
new file mode 100644
index 0000000..80f2bc7
--- /dev/null
+++ b/xorg-xserver/xorg-server/xorg-server-1.1.99.903-fixes-1.patch
@@ -0,0 +1,57 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2006-12-20
+Initial Package Version: 1.1.99.903
+Origin: Dan Nicholson
+Upstream Status: Unknown
+Description: Fixes linking MesaLib 6.5.2
+
+diff -pNur xorg-server-1.1.99.903.orig/GL/mesa/main/Makefile.am
xorg-server-1.1.99.903/GL/mesa/main/Makefile.am
+--- xorg-server-1.1.99.903.orig/GL/mesa/main/Makefile.am 2006-12-01
22:48:41.000000000 +0000
++++ xorg-server-1.1.99.903/GL/mesa/main/Makefile.am 2006-12-21
06:21:31.000000000 +0000
+@@ -60,6 +60,7 @@ nodist_libmain_la_SOURCES = accum.c \
+ light.c \
+ lines.c \
+ matrix.c \
++ mipmap.c \
+ mm.c \
+ occlude.c \
+ pixel.c \
+diff -pNur xorg-server-1.1.99.903.orig/GL/mesa/main/Makefile.in
xorg-server-1.1.99.903/GL/mesa/main/Makefile.in
+--- xorg-server-1.1.99.903.orig/GL/mesa/main/Makefile.in 2006-12-01
23:47:13.000000000 +0000
++++ xorg-server-1.1.99.903/GL/mesa/main/Makefile.in 2006-12-21
06:30:07.000000000 +0000
+@@ -63,12 +63,12 @@ nodist_libmain_la_OBJECTS = accum.lo api
+ drawpix.lo enable.lo enums.lo eval.lo execmem.lo extensions.lo \
+ fbobject.lo feedback.lo fog.lo framebuffer.lo get.lo \
+ getstring.lo hash.lo hint.lo histogram.lo image.lo imports.lo \
+- light.lo lines.lo matrix.lo mm.lo occlude.lo pixel.lo \
+- points.lo polygon.lo rastpos.lo rbadaptors.lo renderbuffer.lo \
+- state.lo stencil.lo texcompress.lo texcompress_fxt1.lo \
+- texcompress_s3tc.lo texenvprogram.lo texformat.lo teximage.lo \
+- texobj.lo texrender.lo texstate.lo texstore.lo varray.lo \
+- $(am__objects_1) vtxfmt.lo
++ light.lo lines.lo matrix.lo mipmap.lo mm.lo occlude.lo \
++ pixel.lo points.lo polygon.lo rastpos.lo rbadaptors.lo \
++ renderbuffer.lo state.lo stencil.lo texcompress.lo \
++ texcompress_fxt1.lo texcompress_s3tc.lo texenvprogram.lo \
++ texformat.lo teximage.lo texobj.lo texrender.lo texstate.lo \
++ texstore.lo varray.lo $(am__objects_1) vtxfmt.lo
+ libmain_la_OBJECTS = $(nodist_libmain_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
-I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
-I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
-I$(top_builddir)/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -598,6 +597,7 @@ nodist_libmain_la_SOURCES = accum.c \
+ light.c \
+ lines.c \
+ matrix.c \
++ mipmap.c \
+ mm.c \
+ occlude.c \
+ pixel.c \
+@@ -711,6 +711,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mipmap.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mm.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occlude.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel.Plo@am__quote@
+



  • [SM-Commit] GIT changes to master xorg-modular grimoire by Thomas Orgis (12a773634c6de85348532212454bb3eb8dffc826), Thomas Orgis, 12/31/2006

Archive powered by MHonArc 2.6.24.

Top of Page