sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž Levstik (f4358b790d04a8a959c14f1787217d24e89cdad7)
- From: Andraž Levstik <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž Levstik (f4358b790d04a8a959c14f1787217d24e89cdad7)
- Date: Sun, 2 Dec 2007 10:06:41 -0600
GIT changes to devel-xorg-modular grimoire by Andraž Levstik
<ruskie AT mages.ath.cx>:
xorg-app/compiz/DETAILS | 4
xorg-app/compiz/HISTORY | 3
xorg-driver/xf86-input-evdev/DETAILS | 4
xorg-driver/xf86-input-evdev/HISTORY | 3
xorg-driver/xf86-input-joystick/DETAILS | 4
xorg-driver/xf86-input-joystick/HISTORY | 3
xorg-driver/xf86-video-intel/DETAILS | 4
xorg-driver/xf86-video-intel/HISTORY | 3
xorg-driver/xf86-video-nv/DETAILS | 4
xorg-driver/xf86-video-nv/HISTORY | 3
xorg-driver/xf86-video-sis/DETAILS | 4
xorg-driver/xf86-video-sis/HISTORY | 3
xorg-lib/pixman/DETAILS | 4
xorg-lib/pixman/HISTORY | 3
xorg-proto/glproto/DETAILS | 4
xorg-proto/glproto/HISTORY | 3
xorg-xserver/xorg-server/BUILD | 4
xorg-xserver/xorg-server/DEPENDS | 253
++++++++++++++++----------------
xorg-xserver/xorg-server/DETAILS | 8 -
xorg-xserver/xorg-server/FINAL | 11 +
xorg-xserver/xorg-server/HISTORY | 12 +
xorg-xserver/xorg-server/PRE_BUILD | 3
xorg-xserver/xorg-server/UP_TRIGGERS | 103 +++++++++++++
23 files changed, 306 insertions(+), 144 deletions(-)
New commits:
commit f4358b790d04a8a959c14f1787217d24e89cdad7
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-driver/xf86-input-evdev/: version update
commit 24536f065f78c92fa37f4fb74132e9d28f2f19c9
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-driver/xf86-input-joystick: version update
commit b89f75ee948d135ed49fe16801d84ac3564322b7
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-xserver/xorg-server: hack in FINAL to break lefs off some other
spells to get the ordering proper and various other bugfixes that
hopefully solve most bugs...
commit 10915d9507e6fa28f013190973a0ede982d29fb7
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-proto/glproto: version update
commit 82fc6d940bd59a851e1afdb5dac449c0fda3d638
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-lib/pixman: version update
commit eb821620b1cf44e4cdbc2bb5f8cab6e5c1d36502
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-driver/xf86-video-sis: version update
commit cedd288d806d225d2660d40deb71ee6ca56193fb
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-driver/xf86-video-nv: version update
commit a6cb36460bc01a35872e38e2c61e96e0a18eab41
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-driver/xf86-video-intel: version update
commit e2e4ff9fa382776fe9af71d4ae1751d8dfda6e43
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-app/compiz: version update
commit 29c77ba60e3f9d284bcdb3d27ca3c5827c53712b
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
xorg-server: update to 1.4 but broken so far
diff --git a/xorg-app/compiz/DETAILS b/xorg-app/compiz/DETAILS
index e5f19af..e07c41a 100755
--- a/xorg-app/compiz/DETAILS
+++ b/xorg-app/compiz/DETAILS
@@ -1,8 +1,8 @@
SPELL=compiz
- VERSION=0.6.0
+ VERSION=0.6.2
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-
SOURCE_HASH=sha512:1230bd1c39534703f588bdea093ea8d46dfd6252907dfed3f703c3fdc6a32a5e155b1d2e3a21fdf568d572287561a9ee9bb0d3581703be4b922089fae1022ab1
+
SOURCE_HASH=sha512:9dbea4f0f42edc08f66adeb98c98ed1bd45ac632a0e6b36e6432a5752927de51cdcf12ef1f99077c5c3e0a71fdf8396e68393c6db239f1d9ff19e0210a59018d
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20061003
diff --git a/xorg-app/compiz/HISTORY b/xorg-app/compiz/HISTORY
index fe903e8..18a17a8 100644
--- a/xorg-app/compiz/HISTORY
+++ b/xorg-app/compiz/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.6.2
+
2007-10-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: Changed SOURCE_URL[0] extension
updated spell to 0.6.0
diff --git a/xorg-driver/xf86-input-evdev/DETAILS
b/xorg-driver/xf86-input-evdev/DETAILS
index ac557d1..a03aba8 100755
--- a/xorg-driver/xf86-input-evdev/DETAILS
+++ b/xorg-driver/xf86-input-evdev/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-input-evdev
PKG=xf86-input-evdev
- VERSION=1.1.5
+ VERSION=1.2.0
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:2faee6db18cf729f1dcf90546c1f97a8c8b857acdb776789584aecb4c588d26104b70c4b21b87bbbb07bb3ef4f0f1a826b96ee331832cbab701ed7475aab3e2c
+
SOURCE_HASH=sha512:93b97c7492f8167848c4d5a0caf6752fdb1f851fb8c1fd3301f1c762d0f0b58f5a7f2b6fca42305696b0916a27b8fed007b6d8192baed53d14eafb43e0a614ce
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-input-evdev/HISTORY
b/xorg-driver/xf86-input-evdev/HISTORY
index 9daf2ad..aa26385 100644
--- a/xorg-driver/xf86-input-evdev/HISTORY
+++ b/xorg-driver/xf86-input-evdev/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.2.0
+
2007-07-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated description
diff --git a/xorg-driver/xf86-input-joystick/DETAILS
b/xorg-driver/xf86-input-joystick/DETAILS
index f849fbd..e6b4704 100755
--- a/xorg-driver/xf86-input-joystick/DETAILS
+++ b/xorg-driver/xf86-input-joystick/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-input-joystick
PKG=xf86-input-joystick
- VERSION=1.2.3
+ VERSION=1.3.0
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:1c4305348fe5a1a8486ce69bebbd59a04824e48a480ff3fd1b729bb015cbe3a250cb25497d6f1aa99b169cef0ee14b61e29b0bc89848e37683096b082489887a
+
SOURCE_HASH=sha512:e460c9a72874f2bb8ab48f56ad8d90cd81b5aa7d29af48a67a1c709604275efc0e8c9d37f85e043d94d19fab233cfc1d589a2d184c0a775fae26d25a06821873
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-input-joystick/HISTORY
b/xorg-driver/xf86-input-joystick/HISTORY
index 7611977..1ec5799 100644
--- a/xorg-driver/xf86-input-joystick/HISTORY
+++ b/xorg-driver/xf86-input-joystick/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.3.0
+
2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.2.3
diff --git a/xorg-driver/xf86-video-intel/DETAILS
b/xorg-driver/xf86-video-intel/DETAILS
index 27412d2..042c187 100755
--- a/xorg-driver/xf86-video-intel/DETAILS
+++ b/xorg-driver/xf86-video-intel/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-video-intel
- VERSION=2.1.1
+ VERSION=2.2.0
XORG_VER=X11R7.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:df42100280ca771fc68139d1fd1f212ec5960c23626f09d84935221c1214552a7a6a657d92ceb4da39fd99ee46ecff814c77f6de1922249fe81583438670a94b
LICENSE[0]=XCL
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20070922
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 95fea6d..adc3b75 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 2.2.0
+
2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS, CONFLICTS: Created
Initial copy from xf86-video-i810
diff --git a/xorg-driver/xf86-video-intel/xf86-video-intel-2.1.1.tar.bz2.sig
b/xorg-driver/xf86-video-intel/xf86-video-intel-2.1.1.tar.bz2.sig
old mode 100644
new mode 100755
diff --git a/xorg-driver/xf86-video-nv/DETAILS
b/xorg-driver/xf86-video-nv/DETAILS
index dd23cb3..fb096ff 100755
--- a/xorg-driver/xf86-video-nv/DETAILS
+++ b/xorg-driver/xf86-video-nv/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-video-nv
PKG=xf86-video-nv
- VERSION=2.1.5
+ VERSION=2.1.6
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:4c05ff580ca790d714f72c35a237508273be24d3e867bf3f91dd059b8c674fb5f242d587e7bfa354bef170d3cded869215d5c0bc740a92d351f72bfbca89e710
+
SOURCE_HASH=sha512:e33a964145030b82e427af0517b43f7419150bf7bb38e1e425ca5e6aa3d902f9f7ffb3b85c2e99cd770f70267284c7bed85eded2f9dee530d40d41a3b9ed8770
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-video-nv/HISTORY
b/xorg-driver/xf86-video-nv/HISTORY
index e75dd4f..826ae74 100644
--- a/xorg-driver/xf86-video-nv/HISTORY
+++ b/xorg-driver/xf86-video-nv/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 2.1.6
+
2007-10-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 2.1.5
diff --git a/xorg-driver/xf86-video-sis/DETAILS
b/xorg-driver/xf86-video-sis/DETAILS
index 8ee9e66..c37143a 100755
--- a/xorg-driver/xf86-video-sis/DETAILS
+++ b/xorg-driver/xf86-video-sis/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-video-sis
PKG=xf86-video-sis
- VERSION=0.9.3
+ VERSION=0.9.4
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:f4d5984ce597e91a63efe94ec44840f1a01c673273ee5c5a48dc37c1bcd9e3d030c77252ddfac8b977ea9ef44a85f67c0f62e35d52e673b6b0e5b4eaf34ffdbb
+
SOURCE_HASH=sha512:1d31ec646be594a2474463e3a3967dce63c4f6f0379a7c0e5ba78bbf4825c0c628b3b50bcfd324d076776861f9a7cd82458f5b6ed1a4a772da3ad3a0c6aa0f57
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-video-sis/HISTORY
b/xorg-driver/xf86-video-sis/HISTORY
index 3a4050d..9fd8756 100644
--- a/xorg-driver/xf86-video-sis/HISTORY
+++ b/xorg-driver/xf86-video-sis/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.9.4
+
2007-07-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated description
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index 0d49ab3..7f1a5f9 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,8 +1,8 @@
SPELL=pixman
- VERSION=0.9.5
+ VERSION=0.9.6
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
-
SOURCE_HASH=sha512:2ff8c4b4b4059af2a6547c2adf27c4cf65c8643f89359f41c3a10c53334acdd3a1a447d9eef117a300390683c89f8f44f8dc0a47570c1f26b5f372c91594572b
+
SOURCE_HASH=sha512:16c5bdb72863aa549ca2b2a9e70c7d4f0f6c7ec5c72065f8d8ae8793c5714e87733410d8eb335dee527f2a496abe0a7a9c381a15a3b8c87db96b4347962a4e6f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xorg.freedesktop.org/";
LICENSE[0]=XCL
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
index 3e34215..3a52d5a 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.9.6
+
2007-12-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: removed as the gtk+2 dependency is only used for some tests
that aren't installed
diff --git a/xorg-proto/glproto/DETAILS b/xorg-proto/glproto/DETAILS
index e59e106..ba46a43 100755
--- a/xorg-proto/glproto/DETAILS
+++ b/xorg-proto/glproto/DETAILS
@@ -1,10 +1,10 @@
SPELL=glproto
- VERSION=1.4.8
+ VERSION=1.4.9
XORG_VER=X11R7.1
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/proto/${SOURCE}
-
SOURCE_HASH=sha512:7971c865f9995e1ee7de6d152535e264d6c030bae8194e1681c5b1bf2e862bdf38d7b4022a8cb013e874dd3fac43caf2cfc1d53e85da2f2e7ea010b4046ce04c
+
SOURCE_HASH=sha512:71f98537761b36bf3f40f680061504ea57aad3c7d38adff70f2431bc00f73257a01fac45bca6597c515b5b3d533fbd049e540d36aa09873a7be992a8bdeea2cb
LICENSE[0]=XCL
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051124
diff --git a/xorg-proto/glproto/HISTORY b/xorg-proto/glproto/HISTORY
index d099c58..a7e59c4 100644
--- a/xorg-proto/glproto/HISTORY
+++ b/xorg-proto/glproto/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.4.9
+
2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update description & short (automated)
diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index 09648cc..83f9c78 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -13,7 +13,9 @@ CFLAGS="${CFLAGS/-O3/-O0}"
CXXFLAGS="${CXXFLAGS/-O3/-O0}"
fi &&
OPTS="${XORG_SERVER_OPTS} \
- --with-mesa-source=${BUILD_DIRECTORY}/Mesa-${VERSION2} \
+ --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${VERSION2} \
+ --with-xkb-output=$TRACK_ROOT/var/lib/xkb \
+ --with-dri-driver-path=$TRACK_ROOT/usr/lib/modules/dri \
--disable-xprint \
--disable-dmx \
${OPTS}" &&
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 935ceed..a86d226 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -4,35 +4,45 @@
##Check this on updates
#depends smgl-gl_select &&
depends libxv "--enable-xv" &&
+# workaround until: https://bugs.freedesktop.org/show_bug.cgi?id=6009
+# get's fixed
if list_find "$XORG_SERVER_OPTS" "--enable-dri"; then
depends libxinerama '--enable-xinerama'
else
- optional_depends libxinerama \
- "--enable-xinerama" \
- "--disable-xinerama" \
+ optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
"Build Xinerama extension"
-fi &&
+fi &&
##
-optional_depends libxevie \
- "--enable-xevie" \
- "--disable-xevie" \
- "Build XEvIE extension" &&
-optional_depends libxcomposite \
- "--enable-composite" \
- "--disable-composite" \
- "Build Composite extension" &&
-optional_depends libxtrap \
- "--enable-xtrap" \
- "--disable-xtrap" \
- "Build XTrap extension" &&
-optional_depends libxscrnsaver \
- "--enable-screensaver" \
- "--disable-screensaver" \
- "Build ScreenSaver extension" &&
-optional_depends libxxf86dga \
- "--enable-dga" \
- "--disable-dga" \
- "Build DGA extension" &&
+optional_depends libxevie \
+ "--enable-xevie" \
+ "--disable-xevie" \
+ "Build XEvIE extension" &&
+optional_depends libxcomposite \
+ "--enable-composite" \
+ "--disable-composite" \
+ "Build Composite extension" &&
+optional_depends libxtrap \
+ "--enable-xtrap" \
+ "--disable-xtrap" \
+ "Build XTrap extension" &&
+optional_depends libxscrnsaver \
+ "--enable-screensaver" \
+ "--disable-screensaver" \
+ "Build ScreenSaver extension" &&
+optional_depends libxxf86dga \
+ "--enable-dga" \
+ "--disable-dga" \
+ "Build DGA extension" &&
+optional_depends dbus \
+ "--enable-config-dbus" \
+ "--disable-config-dbus" \
+ "Enable D-BUS API support" &&
+optional_depends hal \
+ "--enable-config-hal" \
+ "--disable-config-hal" \
+ "Enable HAL support" &&
#optional_depends libxp \
# "--enable-xprint" \
# "--disable-xprint" \
@@ -41,79 +51,80 @@ optional_depends libxxf86dga \
# "--enable-dmx" \
# "--disable-dmx" \
# "Build DMX server" &&
-optional_depends freetype2 \
- "--enable-freetype" \
- "--disable-freetype" \
+optional_depends freetype2 \
+ "--enable-freetype" \
+ "--disable-freetype" \
"Build Xprint FreeType backend" &&
-optional_depends libxfontcache \
- "--enable-fontcache" \
- "--disable-fontcache" \
- "Build FontCache extension" &&
-depends libxi &&
-depends util-macros &&
-depends xinit &&
-depends bitmap &&
-depends xhost &&
-depends xauth &&
-depends bigreqsproto &&
-depends compositeproto &&
-depends damageproto &&
-depends dmxproto &&
-depends evieext &&
-depends fixesproto &&
-depends fontcacheproto &&
-depends fontsproto &&
-depends glproto &&
-depends inputproto &&
-depends kbproto &&
-depends printproto &&
-depends randrproto &&
-depends recordproto &&
-depends renderproto &&
-depends resourceproto &&
-depends scrnsaverproto &&
-depends trapproto &&
-depends videoproto &&
-depends xcmiscproto &&
-depends xextproto &&
-depends xf86bigfontproto &&
-depends xf86dgaproto &&
-depends xf86driproto &&
-depends xf86miscproto &&
-depends xf86rushproto &&
-depends xf86vidmodeproto &&
-depends xineramaproto &&
-depends xproto &&
-depends xproxymanagementprotocol &&
-depends libxaw &&
-depends libxkbui &&
-depends libxfont &&
-depends xtrans &&
-depends libxau &&
-depends libxkbfile &&
-depends libxdmcp &&
-depends libxxf86misc &&
-depends libxxf86vm &&
-depends libdrm &&
-depends liblbxutil &&
-depends libxres &&
-depends bison &&
-depends flex &&
-depends pkgconfig &&
-depends libtool &&
-depends gawk &&
-depends mesalib &&
-depends rgb &&
-depends font-cursor-misc &&
-depends font-misc-misc &&
-depends font-alias &&
+optional_depends libxfontcache \
+ "--enable-fontcache" \
+ "--disable-fontcache" \
+ "Build FontCache extension" &&
+depends libxi &&
+depends util-macros &&
+depends xinit &&
+depends bitmap &&
+depends xhost &&
+depends xauth &&
+depends bigreqsproto &&
+depends pixman &&
+depends compositeproto &&
+depends damageproto &&
+depends dmxproto &&
+depends evieext &&
+depends fixesproto &&
+depends fontcacheproto &&
+depends fontsproto &&
+depends glproto &&
+depends inputproto &&
+depends kbproto &&
+depends printproto &&
+depends randrproto &&
+depends recordproto &&
+depends renderproto &&
+depends resourceproto &&
+depends scrnsaverproto &&
+depends trapproto &&
+depends videoproto &&
+depends xcmiscproto &&
+depends xextproto &&
+depends xf86bigfontproto &&
+depends xf86dgaproto &&
+depends xf86driproto &&
+depends xf86miscproto &&
+depends xf86rushproto &&
+depends xf86vidmodeproto &&
+depends xineramaproto &&
+depends xproto &&
+depends xproxymanagementprotocol &&
+depends libxaw &&
+depends libxkbui &&
+depends libxfont &&
+depends xtrans &&
+depends libxau &&
+depends libxkbfile &&
+depends libxdmcp &&
+depends libxxf86misc &&
+depends libxxf86vm &&
+depends libdrm &&
+depends liblbxutil &&
+depends libxres &&
+depends bison &&
+depends flex &&
+depends pkgconfig &&
+depends libtool &&
+depends gawk &&
+depends mesalib &&
+depends rgb &&
+depends font-cursor-misc &&
+depends font-misc-misc &&
+depends font-alias &&
if list_find "$XORG_SERVER_FONT_100DPI" "all"
then
-depends font-bh-100dpi &&
-depends font-adobe-100dpi &&
-depends font-bitstream-100dpi &&
-depends font-adobe-utopia-100dpi &&
+depends font-bh-100dpi &&
+depends font-adobe-100dpi &&
+depends font-bitstream-100dpi &&
+depends font-adobe-utopia-100dpi &&
depends font-bh-lucidatypewriter-100dpi
elif list_find "$XORG_SERVER_FONT_100DPI" "none"
then
@@ -123,14 +134,14 @@ for font100dpi in $XORG_SERVER_FONT_100DPI
do
depends $font100dpi
done
-fi &&
+fi &&
if list_find "$XORG_SERVER_FONT_75DPI" "all"
then
-depends font-bh-75dpi &&
-depends font-adobe-75dpi &&
-depends font-bitstream-75dpi &&
-depends font-adobe-utopia-75dpi &&
+depends font-bh-75dpi &&
+depends font-adobe-75dpi &&
+depends font-bitstream-75dpi &&
+depends font-adobe-utopia-75dpi &&
depends font-bh-lucidatypewriter-75dpi
elif list_find "$XORG_SERVER_FONT_75DPI" "none"
then
@@ -140,7 +151,7 @@ for font75dpi in $XORG_SERVER_FONT_75DPI
do
depends $font75dpi
done
-fi &&
+fi &&
if list_find "$XORG_SERVER_FONT_SPEEDO" "all"
then
@@ -153,14 +164,14 @@ for speedo in $XORG_SERVER_FONT_SPEEDO
do
depends $speedo
done
-fi &&
+fi &&
if list_find "$XORG_SERVER_FONT_TYPE1" "all"
then
-depends font-bh-type1 &&
-depends font-ibm-type1 &&
-depends font-xfree86-type1 &&
-depends font-bitstream-type1 &&
+depends font-bh-type1 &&
+depends font-ibm-type1 &&
+depends font-xfree86-type1 &&
+depends font-bitstream-type1 &&
depends font-adobe-utopia-type1
elif list_find "$XORG_SERVER_FONT_TYPE1" "none"
then
@@ -170,12 +181,12 @@ for type1 in $XORG_SERVER_FONT_TYPE1
do
depends $type1
done
-fi &&
+fi &&
if list_find "$XORG_SERVER_FONT_TTFOTF" "all"
then
-depends font-bh-ttf &&
-depends font-misc-meltho &&
+depends font-bh-ttf &&
+depends font-misc-meltho &&
depends font-misc-ethiopic
elif list_find "$XORG_SERVER_FONT_TTFOTF" "none"
then
@@ -185,23 +196,23 @@ for ttfotf in $XORG_SERVER_FONT_TTFOTF
do
depends $ttfotf
done
-fi &&
+fi &&
if list_find "$XORG_SERVER_FONT_MISC" "all"
then
-depends font-dec-misc &&
-depends font-sun-misc &&
-depends font-jis-misc &&
-depends font-mutt-misc &&
-depends font-sony-misc &&
-depends font-isas-misc &&
-depends font-micro-misc &&
-depends font-arabic-misc &&
-depends font-daewoo-misc &&
-depends font-misc-cyrillic &&
-depends font-cronyx-cyrillic &&
-depends font-schumacher-misc &&
-depends font-screen-cyrillic &&
+depends font-dec-misc &&
+depends font-sun-misc &&
+depends font-jis-misc &&
+depends font-mutt-misc &&
+depends font-sony-misc &&
+depends font-isas-misc &&
+depends font-micro-misc &&
+depends font-arabic-misc &&
+depends font-daewoo-misc &&
+depends font-misc-cyrillic &&
+depends font-cronyx-cyrillic &&
+depends font-schumacher-misc &&
+depends font-screen-cyrillic &&
depends font-winitzki-cyrillic
elif list_find "$XORG_SERVER_FONT_MISC" "none"
then
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 25c82fa..fee54ea 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,13 +1,13 @@
SPELL=xorg-server
- VERSION=1.3.0.0
+ VERSION=1.4
XORG_VER=X11R7.1
- VERSION2=6.5.2
+ VERSION2=7.0.2
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:5660b7e897f72d17dec110e85474dfcf4d842ede59c2316a0899bc13a72aab953e0cd1726845d1e0f22c1ac4f12f11446ebda56c76e6bbd457c174b46b009b48
-
SOURCE2_HASH=sha512:8b3d1110539684d7b6f0469f471d2c5902e01140bc6c29a9c7f0859dafbd0759ece53799b49845a13c2aef56fb3617a241314e7b3071889ff77ceff08ed14d08
+
SOURCE_HASH=sha512:7c63733f89d3371b51464495e28583a21d58c5ce1edb36326292aaa19d8a4384aa008af778e0189fe4506fe903f5d565388941d6cf71366dd22e60b69b277e86
+
SOURCE2_HASH=sha512:a69707bc16e0580d7ab7b45ff77d61c8209657545751a3cf2ad2b2e4edd1a153a2bb4c629d276636d3ee4d9d79c71f435f536bc07e7ef44e481816a1ab0b3dc7
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/FINAL b/xorg-xserver/xorg-server/FINAL
index d6ba2fc..b1c7d94 100755
--- a/xorg-xserver/xorg-server/FINAL
+++ b/xorg-xserver/xorg-server/FINAL
@@ -1,4 +1,13 @@
-rm -rf ${SOURCE2_DIRECTORY}
+# !!!HACK ALERT!!!
+# breaknig some other spells so that check_self produces
+# desired result
+# !!!HACK ALERT!!!
+
+rm -f $INSTALL_ROOT/usr/lib/libxkbfile.so
+rm -f $INSTALL_ROOT/usr/lib/libxkbui.so
+rm -f $INSTALL_ROOT/usr/bin/setxkbmap
+rm -f $INSTALL_ROOT//usr/bin/xkbcomp
+
#smgl-gl_select -s mesa
#Temporary until this is finalized by the smgl-gl_select
#ln -vfs ${TRACK_ROOT}/usr/include/GL/mesa/*.h \
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index d910a40..109ff2c 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,6 +1,18 @@
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: correct some paths and fix XKB breakage
+ * PRE_BUILD: unpack into the SOURCE_DIRECTORY
+ * FINAL: add a hack to force rebuild of some spells AFTER
+ the cast
+ * UP_TRIGGERS: stuff needs to be rebuilt
+ * DETAILS: mesalib to 7.0.2
+
2007-10-14 Ismael E. Luceno <ismael.luceno AT gmail.com>
* DETAILS: updated description & short
+2007-09-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update
+ * DEPENDS: new depends pixman, hal and dbus
+
2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* BUILD: added a fix for a gcc 4.2.0 regression
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 1fd55a4..ad92b73 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,2 +1,3 @@
-default_pre_build &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
unpack_file 2
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS
b/xorg-xserver/xorg-server/UP_TRIGGERS
new file mode 100755
index 0000000..d698efa
--- /dev/null
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -0,0 +1,103 @@
+# this makes ABI changes automatically cast those that depend on openssl via
an up_trigger
+
+local OLD_SPELL_VERSION=""
+local each
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [[ $OLD_SPELL_VERSION != 1.4 ]] ; then
+ for each in linuxwacom \
+ xf86-video-i128 \
+ xf86-input-acecad \
+ xf86-video-i740 \
+ xf86-input-aiptek \
+ xf86-video-i810 \
+ xf86-input-calcomp \
+ xf86-video-impact \
+ xf86-input-citron \
+ xf86-video-imstt \
+ xf86-input-digitaledge \
+ xf86-video-intel \
+ xf86-input-dmc \
+ xf86-video-mga \
+ xf86-input-dynapro \
+ xf86-video-neomagic \
+ xf86-input-elo2300 \
+ xf86-video-newport \
+ xf86-input-elographics \
+ xf86-video-nouveau \
+ xf86-input-evdev \
+ xf86-video-nsc \
+ xf86-input-fpit \
+ xf86-video-nv \
+ xf86-input-hyperpen \
+ xf86-video-openchrome \
+ xf86-input-jamstudio \
+ xf86-video-radeonhd \
+ xf86-input-joystick \
+ xf86-video-rendition \
+ xf86-input-keyboard \
+ xf86-video-s3 \
+ xf86-input-magellan \
+ xf86-video-s3virge \
+ xf86-input-magictouch \
+ xf86-video-savage \
+ xf86-input-microtouch \
+ xf86-video-siliconmotion \
+ xf86-input-mouse \
+ xf86-video-sisusb \
+ xf86-input-mutouch \
+ xf86-video-sis \
+ xf86-input-palmax \
+ xf86-video-sunbw2 \
+ xf86-input-penmount \
+ xf86-video-suncg14 \
+ xf86-input-spaceorb \
+ xf86-video-suncg3 \
+ xf86-input-summa \
+ xf86-video-suncg6 \
+ xf86-input-tek4957 \
+ xf86-video-sunffb \
+ xf86-input-ur98 \
+ xf86-video-sunleo \
+ xf86-input-vmmouse \
+ xf86-video-suntcx \
+ xf86-input-void \
+ xf86-video-tdfx \
+ xf86-video-apm \
+ xf86-video-tga \
+ xf86-video-ark \
+ xf86-video-trident \
+ xf86-video-ast \
+ xf86-video-tseng \
+ xf86-video-ati \
+ xf86-video-v4l \
+ xf86-video-chips \
+ xf86-video-vesa \
+ xf86-video-cirrus \
+ xf86-video-vga \
+ xf86-video-cyrix \
+ xf86-video-via \
+ xf86-video-dummy \
+ xf86-video-vmware \
+ xf86-video-fbdev \
+ xf86-video-voodoo \
+ xf86-video-glint \
+ xf86-video-wsfb \
+ mesalib
+ do
+ spell_ok $each && up_trigger $each cast_self
+ done
+fi
+if [[ $OLD_SPELL_VERSION != 1.4 ]] ; then
+ for each in xkbutils \
+ xkbcomp \
+ xkbprint \
+ xkbevd \
+ libxkbui \
+ libxkbfile \
+ xkeyboard-config \
+ setxkbmap
+ do
+ spell_ok $each && up_trigger $each check_self
+ done
+fi
+
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž Levstik (f4358b790d04a8a959c14f1787217d24e89cdad7), Andraž Levstik, 12/02/2007
Archive powered by MHonArc 2.6.24.