Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik (062831e086a23dd35185bf6ccc6626fa50392ccc)

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ž 'ruskie' Levstik (062831e086a23dd35185bf6ccc6626fa50392ccc)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Andraž 'ruskie' Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik (062831e086a23dd35185bf6ccc6626fa50392ccc)
  • Date: Wed, 15 Apr 2009 11:35:06 -0500
GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik
<ruskie AT codemages.net>:

dev/null |binary
xorg-driver/xf86-input-joystick/DETAILS | 4 -
xorg-driver/xf86-input-joystick/HISTORY | 3 +
xorg-driver/xf86-video-ast/DETAILS | 4 -
xorg-driver/xf86-video-ast/HISTORY | 3 +
xorg-driver/xf86-video-ati/DETAILS | 4 -
xorg-driver/xf86-video-ati/HISTORY | 3 +
xorg-driver/xf86-video-ati/xf86-video-ati-6.12.0.tar.bz2.sig | 0
xorg-driver/xf86-video-nv/DETAILS | 4 -
xorg-driver/xf86-video-nv/HISTORY | 3 +
xorg-driver/xf86-video-nv/xf86-video-nv-2.1.12.tar.bz2.sig | 0
xorg-driver/xf86-video-radeonhd/DETAILS | 5 -
xorg-driver/xf86-video-radeonhd/HISTORY | 3 +
xorg-lib/libx11/DETAILS | 4 -
xorg-lib/libx11/HISTORY | 3 +
xorg-lib/pixman/DETAILS | 4 -
xorg-lib/pixman/HISTORY | 3 +
xorg-xserver/xorg-server/CONFIGURE | 7 --
xorg-xserver/xorg-server/DETAILS | 5 -
xorg-xserver/xorg-server/HISTORY | 6 ++
xorg-xserver/xorg-server/PRE_BUILD | 7 --
xorg-xserver/xorg-server/gl_select.patch | 32
+++++------
xorg-xserver/xorg-server/xorg-server-mesa.patch | 10 ---
23 files changed, 62 insertions(+), 55 deletions(-)

New commits:
commit 062831e086a23dd35185bf6ccc6626fa50392ccc
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xf86-input-joystick: version 1.4.1

commit a492d34237f51d409842b7189077dddefacd5855
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xf86-video-ast: updated to 0.88.0

commit 2ec6e7d781b2467981bf51fa5b7757c829a14ccc
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xf86-video-nv: updated to 2.1.13

commit 8097a944af8138b5de294d83855ac38c2c633586
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xf86-video-ati: updated to 6.12.2

commit 16589ac178f84913f364245fd0b17b3f13497a11
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xf86-video-radeonhd: updated to 1.2.5

commit a4995cc7dbfd173e819672dbc0cdff53d2e958ba
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: update to 0.15.2

commit b805e7cf3138660382198231d309914ee07d1421
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

libx11: updated to 1.2.1

commit 6eaaad23a5f81b323107c9d7101538c04c303e6b
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xorg-server: updated to 1.6.1

diff --git a/xorg-driver/xf86-input-joystick/DETAILS
b/xorg-driver/xf86-input-joystick/DETAILS
index 8b4de92..84700d2 100755
--- a/xorg-driver/xf86-input-joystick/DETAILS
+++ b/xorg-driver/xf86-input-joystick/DETAILS
@@ -1,12 +1,12 @@
SPELL=xf86-input-joystick
PKG=xf86-input-joystick
- VERSION=1.4.0
+ VERSION=1.4.1
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
#
SOURCE_HASH=sha512:50c625261863223f81d3b0fa3edc0b6eda4d99e4073d76be0530963f20d771a9f2e654c5d8438f9a461d479af2f20b8ec6a2df3a54cd320328df36f564c2f22b
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
-
SOURCE_HASH=sha512:a6def228f641c7c334ad12431cb3f879b66454040ab942b0e000bf0f3afa4902502540a7fcacf2f8036f3ba8f02e805a4e45ef95509b7060b8bcc80c16684580
+
SOURCE_HASH=sha512:5fff851b52e0370ff07333c44b8d3e2b373e74609daa25c74077dd01302926da3d8d404969bfd55b02099afbf519a09e94834d6f0a32eefecd2413d1ac264bb0
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
diff --git a/xorg-driver/xf86-input-joystick/HISTORY
b/xorg-driver/xf86-input-joystick/HISTORY
index 4388ca7..cb33d1b 100644
--- a/xorg-driver/xf86-input-joystick/HISTORY
+++ b/xorg-driver/xf86-input-joystick/HISTORY
@@ -1,3 +1,6 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.4.1
+
2009-01-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.4.0

diff --git a/xorg-driver/xf86-video-ast/DETAILS
b/xorg-driver/xf86-video-ast/DETAILS
index 84a569d..d35cc29 100755
--- a/xorg-driver/xf86-video-ast/DETAILS
+++ b/xorg-driver/xf86-video-ast/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-video-ast
PKG=xf86-video-ast
- VERSION=0.88.8
+ VERSION=0.89.0
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:b5c987e4ad2a35769890479fd42f2c4dc434132015b2bcab97dcc08226a17646f0a066a8f62719607ffec30f727bef41bbed4589889be360a4dfabf8adc15673
+
SOURCE_HASH=sha512:4f2680893605f2cdb9b08c5c1d5accf834ebc242f01d48b61c57c5c8fee67ba894a8091243f41b376fe34e6384355b96b7bef73a6c2b230e6eb191de3de3b87d
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20060825
diff --git a/xorg-driver/xf86-video-ast/HISTORY
b/xorg-driver/xf86-video-ast/HISTORY
index 8d9d02a..1b034a9 100644
--- a/xorg-driver/xf86-video-ast/HISTORY
+++ b/xorg-driver/xf86-video-ast/HISTORY
@@ -1,3 +1,6 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.89.0
+
2009-01-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.88.8

diff --git a/xorg-driver/xf86-video-ati/DETAILS
b/xorg-driver/xf86-video-ati/DETAILS
index 524b12e..6a11289 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -11,10 +11,10 @@ if [[ $ATI_SCM == y ]]; then

SOURCE_URL[0]="git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati"
SOURCE_IGNORE=volatile
else
- VERSION=6.12.1
+ VERSION=6.12.2
SOURCE=${SPELL}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:11f9077fcad1158e8e189d4da5b4127ce95168eabbb142b69e344d8516b14a69adabf2b0f31c5d240d4e06f48fd06d82269fa9f39e823a01bf003cc4272ed91a
+
SOURCE_HASH=sha512:e340e98267a5433efe589f57bb0b93b45dd29a13ff5860bfeab73bb06f322c2c21e5d4c9f339815857228a0fd762eb432d1635990f6c527e9796bc198c70c72b
fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index a04a5ba..2a91d44 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,6 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 6.12.2
+
2009-03-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 6.12.1,
SOURCE_URL back to normal
diff --git a/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.0.tar.bz2.sig
b/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.0.tar.bz2.sig
deleted file mode 100644
index 8757bf3..0000000
Binary files a/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.0.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-driver/xf86-video-nv/DETAILS
b/xorg-driver/xf86-video-nv/DETAILS
index 2af2acc..279c4f8 100755
--- a/xorg-driver/xf86-video-nv/DETAILS
+++ b/xorg-driver/xf86-video-nv/DETAILS
@@ -1,11 +1,11 @@
SPELL=xf86-video-nv
PKG=xf86-video-nv
- VERSION=2.1.12
+ VERSION=2.1.13
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
#
SOURCE_HASH=sha512:042d945a89cca960c376e3328604f6df00a7bc50fa41ccc9090f355c4e114d18dc41db993ffeb34ad90c8bde6f1218a684f78d8820b741a9287ca50ef8558167
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:62f49e713e6ab4ba5b8a6a4e901b1267ee1999cfd32917ff967e3bccefb82ec9e02409fcd9bde26e895b939f191b75aa08ec42ade297bb55f118e89a77f7a30b
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
diff --git a/xorg-driver/xf86-video-nv/HISTORY
b/xorg-driver/xf86-video-nv/HISTORY
index 3e08135..c3a3cf7 100644
--- a/xorg-driver/xf86-video-nv/HISTORY
+++ b/xorg-driver/xf86-video-nv/HISTORY
@@ -1,3 +1,6 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 2.1.13
+
2008-10-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.1.12

diff --git a/xorg-driver/xf86-video-nv/xf86-video-nv-2.1.12.tar.bz2.sig
b/xorg-driver/xf86-video-nv/xf86-video-nv-2.1.12.tar.bz2.sig
deleted file mode 100644
index 5cc2e90..0000000
Binary files a/xorg-driver/xf86-video-nv/xf86-video-nv-2.1.12.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-driver/xf86-video-radeonhd/DETAILS
b/xorg-driver/xf86-video-radeonhd/DETAILS
index f9454c9..a247ddc 100755
--- a/xorg-driver/xf86-video-radeonhd/DETAILS
+++ b/xorg-driver/xf86-video-radeonhd/DETAILS
@@ -11,14 +11,13 @@ fi
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
else
- VERSION=1.2.4
+ VERSION=1.2.5
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
#
SOURCE_HASH=sha512:39b3eee7788ffefd73e5437bb9486e4425d92e1ad572a523ed77bd9608dae021f956db0996439f89b63511794e5cdc0eb9e3be1179d5de07eba31709fff225ec
-
SOURCE_HASH=sha512:0ecf9528d140572ab0ffaf89ead8d15e1786462ed6691e7855183a45b7fe9329dad7b4ad864a0ce9fb3555114494f8e1baba033df8332e973b408d6a79f35d67
+
SOURCE_HASH=sha512:775faacdc6a9ada3f2c7ec6732079591f5df52e5862067d5bcf572b970aa61c93ed3b94840ac041849103d02d0188e41f7672c59543142bfb14e79957780d6e8
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
- PATCHLEVEL=1
WEB_SITE=http://xorg.freedesktop.org/wiki
LICENSE[0]=XCL
ENTERED=20070714
diff --git a/xorg-driver/xf86-video-radeonhd/HISTORY
b/xorg-driver/xf86-video-radeonhd/HISTORY
index 8e2e097..d04c774 100644
--- a/xorg-driver/xf86-video-radeonhd/HISTORY
+++ b/xorg-driver/xf86-video-radeonhd/HISTORY
@@ -1,3 +1,6 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.2.5
+
2009-04-07 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS,PREPARE: only needs drm with r6xx-r7xx-support
to work correctly now.
diff --git a/xorg-lib/libx11/DETAILS b/xorg-lib/libx11/DETAILS
index 3b5b257..bc88b9e 100755
--- a/xorg-lib/libx11/DETAILS
+++ b/xorg-lib/libx11/DETAILS
@@ -1,7 +1,7 @@
SPELL=libx11
PKG=libX11
- VERSION=1.2
-
SOURCE_HASH=sha512:a1ab18f44ff703298d8eadc951b09b061f802cd63d30c2d9c45667b03d03554449a202437e1b022417340fdf306c1c0d7726cef85a623a6c6ef825cc54f59a39
+ VERSION=1.2.1
+
SOURCE_HASH=sha512:5b9e39c49d6232b3be6407d52f00ef84cec1ddccb9f0fc10891b5258fec4cb87043cf886fd44e0f19757f82e82624c796fc626a5604e990cee1373590c930d28
XORG_VER=X11R7.0
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index 6b7320d..fc8e550 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,6 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.2.1
+
2009-02-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2

diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index abd1789..f7b8ca9 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,6 +1,6 @@
SPELL=pixman
- VERSION=0.14.0
-
SOURCE_HASH=sha512:923c1d173d96df3c54857ad50ee24aa6e964080a66ce926957b72ce20b8161ac9028ecf763aba5f256da664e2d5a314023966f166117a5afdc069979140213b3
+ VERSION=0.15.2
+
SOURCE_HASH=sha512:2781e5719d59dbf16406c8f934985b8a0a219c0245490327163eb378c27b4f6ccfa6850dd713965bdba830b34f0bba3f690a258c8d2c3ec635094258cb2fa022
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
index 49794fc..a01856b 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,6 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.15.2
+
2009-02-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.14.0

diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index c8002f3..d9a3a18 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -366,10 +366,5 @@ config_query_multi XORG_SERVER_VIDEO_DRIVER_OBSCURE
\
xf86-video-suncg14 \
xf86-video-newport \
xf86-video-rendition \
- xf86-video-siliconmotion
&&
+ xf86-video-siliconmotion

-config_query_option XORG_SERVER_MESA_PATH_PATCH \
- "Apply patch to search for extra mesalib include files?"\
- n \
- "t" \
- ""
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 17b9c3d..918e550 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,12 +1,11 @@
SPELL=xorg-server
- VERSION=1.6.0
+ VERSION=1.6.1
VERSION2=7.4
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:495200028c21b8a9849eb5d445073a5dfd86e22a2683f48c86c816e8b762eee01752c5915ce8f8f7672bb127a0fb933228a6b0270784d9e5a28bb5f0d83d35f1
-#
SOURCE2_HASH=sha512:1adca91525b4118f1953aeea0d469b01d82035009c34d8f5966f39c72622f2b1f7f1475ba2d0edfc99ac080165a102e6efe99bf7a9893df24fee2aec1a3939b6
+
SOURCE_HASH=sha512:debd35fb83683b8442e314997733606bfaf5b78d46120848ed18a8e9948092d023a0a3d2b97b6bbe16ca99bbf39d7ce95f2c8cfb4d833414e3f030550c79039c
SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_DIRECTORY="$BUILD_DIRECTORY/Mesa-$VERSION2"
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 1ff037f..ad9cc7f 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.6.1
+ * xorg-server-mesa.patch: removed
+ * PRE_BUILD: removed the patch
+ * gl_select.patch: updated
+
2009-04-01 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated MesaLib to 7.4
SOURCE matches upstream posted MD5
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index f2ba511..71d22f8 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -3,9 +3,4 @@ default_pre_build &&
glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
unpack_file 2 &&
-patch -p0 < $SPELL_DIRECTORY/gl_select.patch &&
-if [[ "$XORG_SERVER_MESA_PATH_PATCH" == "t" ]] ; then
- patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch" &&
- # according to lynx^3 this is necessary
- sed -i 's,drm.h,drm/&,' Mesa-7.3/include/GL/internal/dri_interface.h
-fi
+patch -p0 < $SPELL_DIRECTORY/gl_select.patch
diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index 0d989dd..c4f688a 100755
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -1,6 +1,7 @@
---- hw/xfree86/dixmods/Makefile.in.orig 2009-02-28 21:59:16.000000000
+0100
-+++ hw/xfree86/dixmods/Makefile.in 2009-02-28 21:56:05.000000000 +0100
-@@ -589,8 +589,7 @@
+diff -Nuar hw.orig/xfree86/dixmods/Makefile.in hw/xfree86/dixmods/Makefile.in
+--- hw.orig/xfree86/dixmods/Makefile.in 2009-04-15 17:22:15.000000000
+0200
++++ hw/xfree86/dixmods/Makefile.in 2009-04-15 17:24:00.000000000 +0200
+@@ -427,8 +427,7 @@

extsmoduledir = $(moduledir)/extensions
extsmodule_LTLIBRARIES = $(RECORDMOD) \
@@ -10,22 +11,22 @@

AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \
-@@ -663,6 +662,14 @@
+@@ -500,6 +499,14 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(extsmoduledir)" || $(mkdir_p) "$(DESTDIR)$(extsmoduledir)"
+ $(mkdir_p) "$(DESTDIR)$(extsmoduledir)/mesa"
+ @lst='$(GLXMODS)'; for r in $$lst; do \
-+ if test -f $$r; then \
-+ h=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/$$h'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$r"
"$(DESTDIR)$(extsmoduledir)/mesa/$$h"; \
-+ else :; fi; \
++ if test -f $$r; then \
++ h=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/$$h'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$r"
"$(DESTDIR)$(extsmoduledir)/mesa/$$h"; \
++ else :; fi; \
+ done
+ test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
@list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
-@@ -1001,7 +1008,7 @@
+@@ -834,7 +841,7 @@
done
check-am: all-am
check: check-recursive
@@ -34,9 +35,10 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(extsmoduledir)" "$(DESTDIR)$(moduledir)"; do \
---- hw/xfree86/dri/Makefile.in.orig 2009-02-28 22:00:28.000000000 +0100
-+++ hw/xfree86/dri/Makefile.in 2009-02-28 21:48:28.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -Nuar hw.orig/xfree86/dri/Makefile.in hw/xfree86/dri/Makefile.in
+--- hw.orig/xfree86/dri/Makefile.in 2009-04-15 17:22:15.000000000 +0200
++++ hw/xfree86/dri/Makefile.in 2009-04-15 17:22:48.000000000 +0200
+@@ -377,7 +377,7 @@
@GL_CFLAGS@

libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
diff --git a/xorg-xserver/xorg-server/xorg-server-mesa.patch
b/xorg-xserver/xorg-server/xorg-server-mesa.patch
deleted file mode 100644
index 467cff7..0000000
--- a/xorg-xserver/xorg-server/xorg-server-mesa.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glx/Makefile.in.orig 2009-01-18 09:40:02.000000000 -0600
-+++ glx/Makefile.in 2009-01-18 09:40:46.000000000 -0600
-@@ -413,6 +413,7 @@
- -I$(top_srcdir)/hw/xfree86/common \
- -I$(top_srcdir)/hw/xfree86/dri \
- -I$(top_srcdir)/hw/xfree86/dri2 \
-+ -I@MESA_SOURCE@/include \
- -I$(top_srcdir)/mi
-
- glapi_sources = \


  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik (062831e086a23dd35185bf6ccc6626fa50392ccc), Andraž 'ruskie' Levstik, 04/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page