Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (640e35050cc992ff60964739d2eacca9e46de5a1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (640e35050cc992ff60964739d2eacca9e46de5a1)
  • Date: Fri, 31 Jul 2009 18:47:50 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

graphics-libs/mesalib/DEPENDS | 2
graphics-libs/mesalib/HISTORY | 8
++
graphics-libs/mesalib/PRE_BUILD | 1
graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS | 31
++++++++++
4 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 640e35050cc992ff60964739d2eacca9e46de5a1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mesalib: autogen.sh only exists in GIT checkout so only fix there

(Cherry-picked from 89c1fe3f4d97939ddda8400ff54178f240207e9f in
devel-xorg-modular)

commit 512751ceea8013d66fbf3a2310830e8742dd665c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mesalib: bash does not support floating point arithmetic
reduce to integer.
Need to use -lt instead of < for comparison otherwise stupid
simple math such as 2411 < 243 will be true, but 2411 < 241 will
be false. This fixes libdrm always being forced.

(Cherry-picked from 78d06c741e1409ce72f5e14cb36a93a91789fa2f in
devel-xorg-modular)

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 36e5669..d221898 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -16,7 +16,7 @@ depends libxau &&
depends libxfixes &&
depends glproto &&

-if spell_ok libdrm && [[ $(installed_version libdrm) < 2.4.3 ]]; then
+if spell_ok libdrm && [[ $(installed_version libdrm|sed 's:\.::g') -lt 243
]]; then
force_depends libdrm
fi &&

diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index ebc487c..6243db6 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,11 @@
+2009-07-31 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Bash does not support floating point arithmetic, reduce
+ to integer.
+ Need to use -lt instead of < for comparison otherwise stupid simple
+ math such as 2411 < 243 will be true, but 2411 < 241 will be false.
+ This fixes libdrm always being forced
+ * PRE_BUILD: autogen.sh only exists in GIT checkout so only fix there
+
2009-06-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.4.4

diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index c668c61..1500359 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -32,5 +32,6 @@ sedit "s:/X11R6::g" Makefile
&&

if [[ $MESALIB_GIT == y ]]; then
cd "$SOURCE_DIRECTORY" &&
+ sedit "/.*configure.*/d" autogen.sh &&
./autogen.sh
fi
diff --git
a/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
b/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
new file mode 100755
index 0000000..6081a8e
--- /dev/null
+++ b/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
@@ -0,0 +1,31 @@
+depends dri2proto &&
+depends libdrm &&
+depends util-macros &&
+depends gccmakedep &&
+depends lndir &&
+depends xorg-cf-files &&
+depends imake &&
+depends makedepend &&
+depends expat &&
+depends libxdamage &&
+depends libx11 &&
+depends libxext &&
+depends libxxf86vm &&
+depends libxt &&
+depends libxau &&
+depends libxfixes &&
+depends glproto &&
+
+optional_depends libxcb \
+ '--enable-xcb' \
+ '--disable-xcb' \
+ 'Enable XCB support?'
+
+if spell_ok libdrm && [[ "$(installed_version libdrm|sed 's:.::g')" -lt
"243" ]]; then
+ force_depends libdrm
+fi &&
+
+
+if [[ $MESALIB_GIT == y ]]; then
+ depends git
+fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (640e35050cc992ff60964739d2eacca9e46de5a1), Eric Sandall, 07/31/2009

Archive powered by MHonArc 2.6.24.

Top of Page